Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Апстримчик #103

Merged
merged 53 commits into from
Dec 15, 2024
Merged

Апстримчик #103

merged 53 commits into from
Dec 15, 2024

Conversation

Zekins3366
Copy link
Collaborator

Мяу

ErhardSteinhauer and others added 30 commits December 8, 2024 15:37
* Scrapbot spawn animation

* less speed for laser bot

* Update Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/salvage.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/salvage.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* jittering

---------

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
* NFSD Outpost Criminal Records Fix

* Fix comment issues in StationRecordsSystem.cs

* Fix spacing in services.yml

* Better sector-wide records, working crime db

* SectorServiceSystem: teardown service entity

* return shuttle records, bank services

* Frontier comments

* Minimize one changed block

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Whatstone <whatston3@gmail.com>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
* Split alternative save device verb into sink and source variants to make linking conveyor defaults work

* Added frontier comments, removed possibility of dupe verbs

* NetworkConfiguratorSystem comments

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
* Dehydratable sharkminnow

* Remove redundant tags

* Sharkminnow plush/dehyd.: no unshaded

* yaml linter fix
…4#2532)

* emotional support RPG sprites

* Revert emotional RPG probability

* Rename toy RPG to "toy RPG"

* Remove double carriage return
* Disable AI on protected grids WIP

* Check if faction is hostile

* Kill hostile AI on protected grids

* 2024 12 06 hostile ai on grid suggestions (new-frontiers-14#2524)

* Cleanup!

* ProtectedGrid: default KillHostileMobs to false

* Remove comment

---------

Co-authored-by: Whatstone <whatston3@gmail.com>

* Run NPC deletion code on entity parent change evt

* Remove unused HTNSystem dependencies

* NPCDeletionSystem: add startup function

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Whatstone <whatston3@gmail.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com>
* Add Charon shuttle

* Change to a manufacturer name whose acronym has less potential for confusion

* Add BecomesStation component

* Update sell price since a bunch of tile prices just got changed

* Remove some duplicate objects, move around some emergency gear

* Reference correct guidebook page in ship yml

* Hide my network configurator sins

* Move waste vent to a cleaner spot, add wall cabinet to bathroom

* Add vacuum atmos helper markers. Change plating to lattice under engines + fix a few other platings.

* Make some spicy windows mild, also update price and tile count

* Update based on lastest round of feedback

* More decals, tweak supplies

* Equipment, ship price, and decor adjustments

* Replace wall fuel tank with a portable one

---------

Co-authored-by: eidolon <95361+eidolon-zz@users.noreply.github.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com>
* WIP: science revalue, no tech disks & anom sync

* inner anomalies generate cores, no phasing effect

* Remove tech disk references

* comments

* Added info about points earned in scanner

* Unhardcode anomaly assessment values

* Remove anomalous nerd smash

---------

Co-authored-by: Dvir <dvirf01@gmail.com>
* New shade for 100k bills

* Cash sprite consistency

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
…frontiers-14#2418)

* Add notes, restore upstream numbers

* Update disk.yml

* Remove all disk printing fully

* Update salvage_loot.yml

* comments, $200 for a 1k pt research disk

* tech disk terminal board: nospawn

* no research point disk comments (inaccurate)

* tech disk value comment

* tech disk, rare tech disk: nospawn

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
…s-14#2538)

* BuckleSystem: only set handled to true if handled

* Handle buckles when handling buckles

* Remove unused frontier code

---------

Co-authored-by: Dvir <dvirf01@gmail.com>
* job whitelists panel !!! (new-frontiers-14#1678)

* make JobPrototype.Whitelisted respect blanket whitelist, make jobs use it

* add jobwhitelists command and ui

* add job whitelist button to player panel

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Fixup

* Update JobWhitelistManager.cs

* Update JobRequirementsManager.cs

* job whitelist panel presets (new-frontiers-14#1717)

* SHIT -> GOLD

* the label looks like shit

* make jobs that dont use whitelist greyed out on whitelist panel (new-frontiers-14#1718)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Update whitelist_tiers.yml

* FTL

* Update departments.yml

* Update departments.yml

* Whitelist panel suggestions

---------

Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Milon <plmilonpl@gmail.com>
Co-authored-by: Whatstone <whatston3@gmail.com>
* Restore AutoWakeUpComponent function

* AutoWakeUp: cure drowsiness
* Fix Empress Double Thruster

* Yet Another Double Thruster
FrontierATC and others added 16 commits December 11, 2024 22:55
* Add an auto-labeller to the chem dispenser

* "auto-labeler" for en-US spelling

* darkgreen text

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
* Return upstream unused maps to upstream level

* Wreck Cleanup Part 1

* Cleanup

* Update salvage.yml

* WreckLoot suggestions

* Update salvage.yml

* Breaks yml

* Update ignoredPrototypes.yml

* Yml

* Update migration.yml

* Remove missing spawner from cave_factory

* Remove missing prototype from North Pole

* Update salvage.yml

* Added rooms

* Update wreck.yml

* Big wrecks

* Brass Wreck

* Brass

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
…rs-14#2528)

* Add the syringe gun as research (new-frontiers-14#2169)

* Tech added

* Added recipes and made printable

* Tech added

* Added recipes and made printable

* Should solve the conflict

* Should solve the merge conflict

* Emagged protolathe

* Nerf "mini" syringes (new-frontiers-14#2249)

Update chemistry.yml

* Nerf "mini" syringes

* Force transfer, max transfer amount to 5u

* 0.5u on collide, 0.5u per injection, 2s per inject

---------

Co-authored-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
* Fixup

* God help me

* Update dungeon_configs.yml

* Update dungeon_configs.yml

* yaml

* Fix

* Update dungeon_configs.yml

* Update dungeon_configs.yml

* spawnGroups

* Undupe whitelists

* discount dan's dungeon configs

* end my suffixing

* Fix factory wallmounts

* god awful config colours, destroy diamond

* shuttle generator variant

* SalvageOutpost, MedSci touchups

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
* Faction review

* friendly Baby Dragon, Cat->Mouse hostilities

* Cappy can into NT

* Cat accents, "it" is a valid caveman word

* uuuuuhhh i forgor

* localized dementia typos

* Update cove.yml

---------

Co-authored-by: Dvir <dvirf01@gmail.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
@Zekins3366 Zekins3366 merged commit 16d872a into master Dec 15, 2024
14 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.